auto merge of #485 : alexcrichton/cargo/fix-for-rustc-master, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 29 Aug 2014 19:04:34 +0000 (19:04 +0000)
committerbors <bors@rust-lang.org>
Fri, 29 Aug 2014 19:04:34 +0000 (19:04 +0000)
commit2c8f8e75c537605ac39b2309f4363d53109cdbe7
treeb2b698a2da92c62d0803f0b08dbd771c2fba3b5e
parentb8d0a7874f8d32f4a124556c9108df73e2af1e18
parent0459fb2665744666571b524d4d7fc0eba0b0f97e
auto merge of #485 : alexcrichton/cargo/fix-for-rustc-master, r=alexcrichton

Extending #479 to use a `'static` shell instead of a `'a` shell.